Fix hi-lock-mode interactions with font-lock.
authorDavid Koppelman <koppel@ece.lsu.edu>
Sat, 9 Oct 2010 04:09:19 +0000 (00:09 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 9 Oct 2010 04:09:19 +0000 (00:09 -0400)
commiteada408209d0407bbd107f3bedb9e60207cb3b46
treed589171f37da8932525d9f3b1836c14b2f87dbb1
parentcfdc98ce47a4410bb3c537c1f17f37f0963663e1
Fix hi-lock-mode interactions with font-lock.
* hi-lock.el (hi-lock-font-lock-hook): Check font-lock-fontified
instead of font-lock-mode before adding keywords. Removed
hi-lock-mode off code. Removed inhibit hack.
(hi-lock-set-pattern): Only add keywords if font-lock-fontified
non-nil; removed hook inhibit hack.
lisp/ChangeLog
lisp/hi-lock.el